git-annex.git
13 months agofix fromOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:19:25 +0000 (14:19 -0400)]
fix fromOsPath on windows

Same reasons as 9c9baf7c6581235643661b94f70f76f8a10ae60e

13 months agofix toOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:06:54 +0000 (14:06 -0400)]
fix toOsPath on windows

After recent changes to use OsPath, test suite fails on windows with:

Exception: Uneven number of bytes: 5. This is not a Word16 bytestream.

Hopefully this fixes it. The innefficiency of the conversion is
unfortunate.

13 months agoresponse
Joey Hess [Wed, 29 Jan 2025 16:06:22 +0000 (12:06 -0400)]
response

13 months agoAdded a comment
dmcardle [Wed, 29 Jan 2025 14:44:38 +0000 (14:44 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 10:13:59 +0000 (10:13 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Wed, 29 Jan 2025 09:56:13 +0000 (09:56 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Tue, 28 Jan 2025 21:57:42 +0000 (21:57 +0000)]
Added a comment

13 months ago(no commit message)
jnkl [Tue, 28 Jan 2025 21:32:18 +0000 (21:32 +0000)]

13 months agoAdded a comment
jnkl [Tue, 28 Jan 2025 21:20:17 +0000 (21:20 +0000)]
Added a comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 28 Jan 2025 20:00:09 +0000 (16:00 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows build fix
Joey Hess [Tue, 28 Jan 2025 19:59:45 +0000 (15:59 -0400)]
windows build fix

and a little more bonus RawFilePath conversion

13 months agocorrect typo
cwg [Tue, 28 Jan 2025 19:29:21 +0000 (19:29 +0000)]
correct typo

13 months ago(no commit message)
cwg [Tue, 28 Jan 2025 19:18:02 +0000 (19:18 +0000)]

13 months ago(no commit message)
andrew [Tue, 28 Jan 2025 18:07:59 +0000 (18:07 +0000)]

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:37 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:30 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:57:03 +0000 (11:57 -0400)]
comment

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:38:04 +0000 (11:38 -0400)]
update

13 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:36:02 +0000 (11:36 -0400)]
update

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:12:02 +0000 (11:12 -0400)]
comment

13 months agocomment
Joey Hess [Tue, 28 Jan 2025 14:28:35 +0000 (10:28 -0400)]
comment

13 months agoAdded a comment: Simple config amendment for Apache served repositories
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Tue, 28 Jan 2025 08:34:40 +0000 (08:34 +0000)]
Added a comment: Simple config amendment for Apache served repositories

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 16:23:13 +0000 (12:23 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agocomment
Joey Hess [Mon, 27 Jan 2025 16:19:16 +0000 (12:19 -0400)]
comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:26:15 +0000 (15:26 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:14:44 +0000 (15:14 +0000)]
Added a comment

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:08:57 +0000 (15:08 +0000)]
Added a comment

13 months agothoughts
Joey Hess [Mon, 27 Jan 2025 14:37:35 +0000 (10:37 -0400)]
thoughts

13 months agoupdate comment
Joey Hess [Mon, 27 Jan 2025 14:25:55 +0000 (10:25 -0400)]
update comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 13:35:44 +0000 (09:35 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agofix link
Joey Hess [Mon, 27 Jan 2025 13:35:33 +0000 (09:35 -0400)]
fix link

13 months agoreporting on FTBFS
yarikoptic [Mon, 27 Jan 2025 12:32:32 +0000 (12:32 +0000)]
reporting on FTBFS

13 months agoAdded a comment
matrss [Mon, 27 Jan 2025 11:28:43 +0000 (11:28 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 13:30:10 +0000 (13:30 +0000)]
Added a comment

13 months agoAdded a comment
jnkl [Sun, 26 Jan 2025 13:09:05 +0000 (13:09 +0000)]
Added a comment

13 months agoSome clarifications in my reproduce steps about the state of the rsync remote
luciusf [Sun, 26 Jan 2025 11:29:02 +0000 (11:29 +0000)]
Some clarifications in my reproduce steps about the state of the rsync remote

13 months agorename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn...
luciusf [Sun, 26 Jan 2025 11:19:53 +0000 (11:19 +0000)]
rename bugs/rsyncurl_without___34____58____34___creates_local_folder_as_repo.mdwn to bugs/rsyncurl_without___34____58____34___creates_local_folder_as_remote.mdwn

13 months agoInitial post
luciusf [Sun, 26 Jan 2025 11:18:11 +0000 (11:18 +0000)]
Initial post

13 months ago(no commit message)
goglu6 [Sun, 26 Jan 2025 03:02:03 +0000 (03:02 +0000)]

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:54:18 +0000 (02:54 +0000)]
Added a comment

13 months agoAdded a comment
Atemu [Sun, 26 Jan 2025 02:36:51 +0000 (02:36 +0000)]
Added a comment

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 25 Jan 2025 14:57:07 +0000 (10:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows build fix
Joey Hess [Sat, 25 Jan 2025 14:56:54 +0000 (10:56 -0400)]
windows build fix

13 months ago(no commit message)
jnkl [Sat, 25 Jan 2025 12:00:20 +0000 (12:00 +0000)]

13 months agoAdded a comment
jnkl [Sat, 25 Jan 2025 11:49:29 +0000 (11:49 +0000)]
Added a comment

13 months agoanother windows build fix
Joey Hess [Fri, 24 Jan 2025 20:33:26 +0000 (16:33 -0400)]
another windows build fix

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 19:13:20 +0000 (15:13 -0400)]
more windows and osx build fixes

13 months agomore windows and osx build fixes
Joey Hess [Fri, 24 Jan 2025 17:46:13 +0000 (13:46 -0400)]
more windows and osx build fixes

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 24 Jan 2025 15:39:43 +0000 (11:39 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agowindows and osx build fixes for recent ByteString conversion work
Joey Hess [Fri, 24 Jan 2025 15:37:17 +0000 (11:37 -0400)]
windows and osx build fixes for recent ByteString conversion work

13 months agoavoid build warning on windows
Joey Hess [Fri, 24 Jan 2025 15:33:50 +0000 (11:33 -0400)]
avoid build warning on windows

13 months agoremove a few unused imports on windows
Joey Hess [Fri, 24 Jan 2025 15:32:26 +0000 (11:32 -0400)]
remove a few unused imports on windows

13 months agoAdded a comment
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Fri, 24 Jan 2025 08:04:27 +0000 (08:04 +0000)]
Added a comment

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 21:33:26 +0000 (21:33 +0000)]
Added a comment

13 months agocomplaining about dead
yarikoptic [Thu, 23 Jan 2025 16:12:18 +0000 (16:12 +0000)]
complaining about dead

13 months agoAdded a comment
yarikoptic [Thu, 23 Jan 2025 15:53:39 +0000 (15:53 +0000)]
Added a comment

13 months agoupdate
Joey Hess [Thu, 23 Jan 2025 14:27:18 +0000 (10:27 -0400)]
update

13 months agoresponse
Joey Hess [Wed, 22 Jan 2025 20:48:51 +0000 (16:48 -0400)]
response

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 22 Jan 2025 20:42:50 +0000 (16:42 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoparsePOSIXTime ByteString conversion
Joey Hess [Wed, 22 Jan 2025 20:41:06 +0000 (16:41 -0400)]
parsePOSIXTime ByteString conversion

Some easy (though tiny) speed wins.

Sponsored-by: Luke T. Shumaker on Patreon
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 20:28:29 +0000 (16:28 -0400)]
fix reversion

af3b9cbd3647ecfb3f3f6c4008dc9e64f7d42591 lost takeFileName, breaking the
test suite

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 20:19:06 +0000 (16:19 -0400)]
convert from readFileStrict

This removes that function, using file-io readFile' instead.

Had to deal with newline conversion, which readFileStrict does on
Windows. In a few cases, that was pretty ugly to deal with.

Sponsored-by: Kevin Mueller
13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 19:32:21 +0000 (15:32 -0400)]
fix reversion

In 793ddecd4b72a5e4746b3b426d3bca400737118b, writeSshConfig was made to
writeFile a ByteString, which lost the newline conversion on Windows.

Added linesFile to fix it. This will also be useful for other writeFile
conversions.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 19:19:47 +0000 (15:19 -0400)]
convert from readFileStrict

In cases where it reads lines, which needs newline conversion on
windows.

13 months agoconvert from readFileStrict
Joey Hess [Wed, 22 Jan 2025 18:43:37 +0000 (14:43 -0400)]
convert from readFileStrict

More of these still to convert, but need to be careful of newline
translation.

13 months agofix reversion
Joey Hess [Wed, 22 Jan 2025 18:42:27 +0000 (14:42 -0400)]
fix reversion

793ddecd4b72a5e4746b3b426d3bca400737118b made installWrapper not do
newline conversion on windows.

13 months agouse file-io for readFile/writeFile/appendFile on ByteStrings
Joey Hess [Wed, 22 Jan 2025 18:30:25 +0000 (14:30 -0400)]
use file-io for readFile/writeFile/appendFile on ByteStrings

These are all straightforward, and easy small performance wins.

Sponsored-by: Nicholas Golder-Manning
13 months agoRawFilePath conversion for replaceFile
Joey Hess [Wed, 22 Jan 2025 17:37:26 +0000 (13:37 -0400)]
RawFilePath conversion for replaceFile

Sponsored-by: Joshua Antonishen
13 months agosimplify replaceFile using relatedTemplate
Joey Hess [Wed, 22 Jan 2025 17:22:51 +0000 (13:22 -0400)]
simplify replaceFile using relatedTemplate

Now that truncateFilePath and relatedTemplate have both been optimised,
may as well use them in replaceFile, rather than the custom hack it
used.

Removed the windows-specific ifdef as well, because on Windows long
filepaths no longer really a problem, since ghc and git-annex use UNC
converted paths.

replaceFile no longer checks fileNameLengthLimit. That took a syscall,
and since we have an existing file, we know filenames of its length are
supported by the filesystem. Assuming that the withOtherTmp directory is
on the same filesystem as the file replaceFile is being called on, which
I believe it is.

Sponsored-by: Leon Schuermann
13 months agooptimize truncateFilePath
Joey Hess [Wed, 22 Jan 2025 16:34:54 +0000 (12:34 -0400)]
optimize truncateFilePath

Often the filepath will be all ascii, or mostly so, and this
optimisation makes a file that has an ascii suffix of sufficient length
be roundtrip converted between String and ByteString only once, rather
than once per character.

Sponsored-by: Graham Spencer
13 months agooptimize relatedTemplate
Joey Hess [Wed, 22 Jan 2025 15:51:23 +0000 (11:51 -0400)]
optimize relatedTemplate

13 months agobreak out templateAddedLength
Joey Hess [Wed, 22 Jan 2025 15:43:45 +0000 (11:43 -0400)]
break out templateAddedLength

13 months agouse openTempFile from file-io
Joey Hess [Tue, 21 Jan 2025 21:00:37 +0000 (17:00 -0400)]
use openTempFile from file-io

And follow-on changes.

Note that relatedTemplate was changed to operate on a RawFilePath, and
so when it counts the length, it is now the number of bytes, not the
number of code points. This will just make it truncate shorter strings
in some cases, the truncation is still unicode aware.

When not building with the OsPath flag, toOsPath . fromRawFilePath and
fromRawFilePath . fromOsPath do extra conversions back and forth between
String and ByteString. That overhead could be avoided, but that's the
non-optimised build mode, so didn't bother.

Sponsored-by: unqueued
13 months agorename forum/reupload_existing_files_to_bare_repo.mdwn to forum/reuploads_existing_fi...
jnkl [Wed, 22 Jan 2025 07:28:13 +0000 (07:28 +0000)]
rename forum/reupload_existing_files_to_bare_repo.mdwn to forum/reuploads_existing_files_to_bare_repo.mdwn

13 months ago(no commit message)
jnkl [Wed, 22 Jan 2025 07:26:34 +0000 (07:26 +0000)]

13 months agoAdded a comment: Exporting a synced/* branch works now! 🥳
nobodyinperson [Tue, 21 Jan 2025 18:30:50 +0000 (18:30 +0000)]
Added a comment: Exporting a synced/* branch works now! ðŸ¥³

13 months agoadd file-io to build-depends when building with OsPath flag
Joey Hess [Tue, 21 Jan 2025 18:26:04 +0000 (14:26 -0400)]
add file-io to build-depends when building with OsPath flag

Partly converted code to use functions from it, though more remain
unconverted. Most of withFile and openFile now use it.

13 months agoavoid build warning with recent ghc
Joey Hess [Tue, 21 Jan 2025 15:59:38 +0000 (11:59 -0400)]
avoid build warning with recent ghc

foldl' is in Prelude now. Explicitly import Data.List still
for older systems and add explict Prelude import to avoid warning.

13 months agorename OsString to OsPath
Joey Hess [Tue, 21 Jan 2025 15:57:44 +0000 (11:57 -0400)]
rename OsString to OsPath

13 months agoclean up stack.yaml with new versions of dependencies
Joey Hess [Mon, 20 Jan 2025 23:53:15 +0000 (19:53 -0400)]
clean up stack.yaml with new versions of dependencies

13 months agoRawFilePath conversion for Utility.Directory.Stream
Joey Hess [Mon, 20 Jan 2025 18:50:08 +0000 (14:50 -0400)]
RawFilePath conversion for Utility.Directory.Stream

13 months agoRawFilePath conversion of System.Directory
Joey Hess [Mon, 20 Jan 2025 22:03:26 +0000 (18:03 -0400)]
RawFilePath conversion of System.Directory

By using System.Directory.OsPath, which takes and returns OsString,
which is a ShortByteString. So, things like dirContents currently have the
overhead of copying that to a ByteString, but that should be less than
the overhead of using Strings which often in turn were converted to
RawFilePaths.

Added Utility.OsString and the OsString build flag. That flag is turned
on in the stack.yaml, and will be turned on automatically by cabal when
built with new enough libraries. The stack.yaml change is a bit ugly,
and that could be reverted for now if it causes any problems.

Note that Utility.OsString.toOsString on windows is avoiding only a
check of encoding that is documented as being unlikely to fail. I don't
think it can fail in git-annex; if it could, git-annex didn't contain
such an encoding check before, so at worst that should be a wash.

13 months agostop exporting Utility.SystemDirectory from Utility.Directory
Joey Hess [Mon, 20 Jan 2025 23:10:13 +0000 (19:10 -0400)]
stop exporting Utility.SystemDirectory from Utility.Directory

13 months agoupdate
Joey Hess [Mon, 20 Jan 2025 18:18:02 +0000 (14:18 -0400)]
update

13 months agoupdate
Joey Hess [Mon, 20 Jan 2025 17:58:14 +0000 (13:58 -0400)]
update

13 months agorelax annex-tracking-branch to allow "/"
Joey Hess [Mon, 20 Jan 2025 15:31:18 +0000 (11:31 -0400)]
relax annex-tracking-branch to allow "/"

Allow setting remote.foo.annex-tracking-branch to a branch name that
contains "/", as long as it's not a remote tracking branch.

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 20 Jan 2025 15:12:56 +0000 (11:12 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoSupport help.autocorrect settings "never" and "immediate"
Joey Hess [Mon, 20 Jan 2025 15:01:07 +0000 (11:01 -0400)]
Support help.autocorrect settings "never" and "immediate"

13 months agoSupport help.autocorrect=prompt
Joey Hess [Mon, 20 Jan 2025 14:56:12 +0000 (10:56 -0400)]
Support help.autocorrect=prompt

13 months agoReport bug that one can't export synced/ branches
nobodyinperson [Mon, 20 Jan 2025 10:25:51 +0000 (10:25 +0000)]
Report bug that one can't export synced/ branches

13 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 17 Jan 2025 15:11:55 +0000 (11:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

13 months agoAdded a comment: Feature idea
hello@da0030bba070302e85904b4d73db61fb4af7bced [Fri, 17 Jan 2025 11:14:55 +0000 (11:14 +0000)]
Added a comment: Feature idea

13 months ago(no commit message)
hello@da0030bba070302e85904b4d73db61fb4af7bced [Fri, 17 Jan 2025 11:11:51 +0000 (11:11 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 06:30:22 +0000 (06:30 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 06:29:39 +0000 (06:29 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 06:24:07 +0000 (06:24 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 06:23:41 +0000 (06:23 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 05:13:55 +0000 (05:13 +0000)]

13 months ago(no commit message)
goglu6 [Fri, 17 Jan 2025 05:12:14 +0000 (05:12 +0000)]

13 months agoAdded a comment: Still happening, managed to get a reproduction (maybe ?)
hello@da0030bba070302e85904b4d73db61fb4af7bced [Thu, 16 Jan 2025 18:17:52 +0000 (18:17 +0000)]
Added a comment: Still happening, managed to get a reproduction (maybe ?)